bitkeeper revision 1.1159.13.2 (4118a05d8c-7rVahMVITdEqi_yjy1Q)

Modify domain events, add an event when a suspend completes.

diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py
index 72fa81f56c6eca7ec979892e1809cff206c1dedf..dbf0ce6e90daa8cdff58d991b0b3dc287724815b 100644 (file)
--- a/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@ -199,7 +199,7 @@ class XendDomain:
         self.domain_db[info.id] = info.sxpr()
         self.domain_by_name[info.name] = info
         self.sync_domain(info.id)
-        if notify: eserver.inject('xend.domain.created', info.name)
+        if notify: eserver.inject('xend.domain.created', [info.name, info.id])
 
     def _delete_domain(self, id, notify=1):
         """Remove a domain from the tables.
@@ -209,7 +209,7 @@ class XendDomain:
         """
         if id in self.domain_by_id:
             info = self.domain_by_id[id]
-            if notify: eserver.inject('xend.domain.died', info.name)
+            if notify: eserver.inject('xend.domain.died', [info.name, info.id])
             if info.name in self.domain_by_name:
                 del self.domain_by_name[info.name]
             del self.domain_by_id[id]
@@ -239,6 +239,9 @@ class XendDomain:
                 reason = XendDomainInfo.shutdown_reason(d['shutdown_reason'])
                 log.debug('XendDomain>reap> shutdown id=%s reason=%s', id, reason)
                 if reason in ['suspend']:
+                    dominfo = self.domain_by_id.get(id)
+                    name = (dominfo and dominfo.name) or '??'
+                    eserver.inject('xend.domain.suspended', [name, id])
                     continue
                 if reason in ['poweroff', 'reboot']:
                     self.domain_restart_schedule(id, reason)
@@ -421,7 +424,7 @@ class XendDomain:
         @param id: domain id
         """
         dominfo = self.domain_lookup(id)
-        eserver.inject('xend.domain.unpause', dominfo.name)
+        eserver.inject('xend.domain.unpause', [dominfo.name, dominfo.id])
         try:
             return xc.domain_unpause(dom=dominfo.dom)
         except Exception, ex:
@@ -433,7 +436,7 @@ class XendDomain:
         @param id: domain id
         """
         dominfo = self.domain_lookup(id)
-        eserver.inject('xend.domain.pause', dominfo.name)
+        eserver.inject('xend.domain.pause', [dominfo.name, dominfo.id])
         try:
             return xc.domain_pause(dom=dominfo.dom)
         except Exception, ex:
@@ -455,7 +458,7 @@ class XendDomain:
             self.domain_restart_cancel(dominfo.id)
         else:
             self.domain_restart_schedule(dominfo.id, reason, force=1)
-        eserver.inject('xend.domain.shutdown', [dominfo.name, reason])
+        eserver.inject('xend.domain.shutdown', [dominfo.name, dominfo.id, reason])
         if reason == 'halt':
             reason = 'poweroff'
         val = xend.domain_shutdown(dominfo.id, reason)
@@ -535,7 +538,7 @@ class XendDomain:
         """
         dominfo = self.domain_lookup(id)
         log.info('Destroying domain: name=%s', dominfo.name)
-        eserver.inject('xend.domain.destroy', dominfo.name)
+        eserver.inject('xend.domain.destroy', [dominfo.name, dominfo.id])
         if dominfo:
             val = dominfo.destroy()
         else: